Deprecate GtkArrow
authorMatthias Clasen <mclasen@redhat.com>
Tue, 13 May 2014 04:03:34 +0000 (00:03 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 14 May 2014 03:50:13 +0000 (23:50 -0400)
https://bugzilla.gnome.org/show_bug.cgi?id=729564

docs/reference/gtk/gtk-docs.sgml
gtk/Makefile.am
gtk/deprecated/gtkarrow.c [new file with mode: 0644]
gtk/deprecated/gtkarrow.h [new file with mode: 0644]
gtk/gtk.h
gtk/gtkarrow.c [deleted file]
gtk/gtkarrow.h [deleted file]

index 8e749b464be9b493a8da7a1a356907c455471545..dc0b9704662945d698e52b1096a81f597004a329 100644 (file)
     <chapter id="MiscObjects">
       <title>Miscellaneous</title>
       <xi:include href="xml/gtkadjustment.xml" />
-      <xi:include href="xml/gtkarrow.xml" />
       <xi:include href="xml/gtkcalendar.xml" />
       <xi:include href="xml/gtkdrawingarea.xml" />
       <xi:include href="xml/gtkeventbox.xml" />
       <xi:include href="xml/gtkstock.xml" />
       <xi:include href="xml/gtkiconfactory.xml" />
       <xi:include href="xml/gtknumerableicon.xml" />
+      <xi:include href="xml/gtkarrow.xml" />
     </chapter>
 
   </part>
index 2ad225f0b81dec8c3b0fd66aac2bf86208216e04..25691226b06fda7379ccfd5a38240d267e9c30e8 100644 (file)
@@ -157,6 +157,7 @@ deprecated_h_sources =                      \
        deprecated/gtkactivatable.h     \
        deprecated/gtkaction.h          \
        deprecated/gtkactiongroup.h     \
+       deprecated/gtkarrow.h           \
        deprecated/gtkcolorsel.h        \
        deprecated/gtkcolorseldialog.h  \
        deprecated/gtkfontsel.h         \
@@ -214,7 +215,6 @@ gtk_public_h_sources =              \
        gtkappchooserwidget.h   \
        gtkapplication.h        \
        gtkapplicationwindow.h  \
-       gtkarrow.h              \
        gtkaspectframe.h        \
        gtkassistant.h          \
        gtkbbox.h               \
@@ -584,6 +584,7 @@ deprecated_c_sources =                      \
        deprecated/gtkactivatable.c     \
        deprecated/gtkaction.c          \
        deprecated/gtkactiongroup.c     \
+       deprecated/gtkarrow.c           \
        deprecated/gtkcolorsel.c        \
        deprecated/gtkcolorseldialog.c  \
        deprecated/gtkfontsel.c         \
@@ -646,7 +647,6 @@ gtk_base_c_sources =                \
        gtkapplication.c        \
        gtkapplicationimpl.c    \
        gtkapplicationwindow.c  \
-       gtkarrow.c              \
        gtkaspectframe.c        \
        gtkassistant.c          \
        gtkbbox.c               \
diff --git a/gtk/deprecated/gtkarrow.c b/gtk/deprecated/gtkarrow.c
new file mode 100644 (file)
index 0000000..b4c14d1
--- /dev/null
@@ -0,0 +1,372 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+/**
+ * SECTION:gtkarrow
+ * @Short_description: Displays an arrow
+ * @Title: GtkArrow
+ * @See_also: gtk_render_arrow()
+ *
+ * GtkArrow should be used to draw simple arrows that need to point in
+ * one of the four cardinal directions (up, down, left, or right).  The
+ * style of the arrow can be one of shadow in, shadow out, etched in, or
+ * etched out.  Note that these directions and style types may be
+ * amended in versions of GTK+ to come.
+ *
+ * GtkArrow will fill any space alloted to it, but since it is inherited
+ * from #GtkMisc, it can be padded and/or aligned, to fill exactly the
+ * space the programmer desires.
+ *
+ * Arrows are created with a call to gtk_arrow_new().  The direction or
+ * style of an arrow can be changed after creation by using gtk_arrow_set().
+ *
+ * GtkArrow has been deprecated; you can simply use a #GtkImage with a
+ * suitable icon name, such as “pan-down-symbolic“.
+ */
+
+#include "config.h"
+#include <math.h>
+#include "gtkarrow.h"
+#include "gtksizerequest.h"
+#include "gtktypebuiltins.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+
+#include "a11y/gtkarrowaccessible.h"
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
+#define MIN_ARROW_SIZE  15
+
+struct _GtkArrowPrivate
+{
+  gint16 arrow_type;
+  gint16 shadow_type;
+};
+
+enum {
+  PROP_0,
+  PROP_ARROW_TYPE,
+  PROP_SHADOW_TYPE
+};
+
+
+static void     gtk_arrow_set_property (GObject        *object,
+                                        guint           prop_id,
+                                        const GValue   *value,
+                                        GParamSpec     *pspec);
+static void     gtk_arrow_get_property (GObject        *object,
+                                        guint           prop_id,
+                                        GValue         *value,
+                                        GParamSpec     *pspec);
+static gboolean gtk_arrow_draw         (GtkWidget      *widget,
+                                        cairo_t        *cr);
+
+static void     gtk_arrow_get_preferred_width         (GtkWidget           *widget,
+                                                       gint                *minimum_size,
+                                                       gint                *natural_size);
+static void     gtk_arrow_get_preferred_height        (GtkWidget           *widget,
+                                                       gint                *minimum_size,
+                                                       gint                *natural_size);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+G_DEFINE_TYPE_WITH_PRIVATE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+static void
+gtk_arrow_class_init (GtkArrowClass *class)
+{
+  GObjectClass *gobject_class;
+  GtkWidgetClass *widget_class;
+
+  gobject_class = (GObjectClass*) class;
+  widget_class = (GtkWidgetClass*) class;
+
+  gobject_class->set_property = gtk_arrow_set_property;
+  gobject_class->get_property = gtk_arrow_get_property;
+
+  widget_class->draw = gtk_arrow_draw;
+  widget_class->get_preferred_width  = gtk_arrow_get_preferred_width;
+  widget_class->get_preferred_height = gtk_arrow_get_preferred_height;
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_ARROW_TYPE,
+                                   g_param_spec_enum ("arrow-type",
+                                                      P_("Arrow direction"),
+                                                      P_("The direction the arrow should point"),
+                                                     GTK_TYPE_ARROW_TYPE,
+                                                     GTK_ARROW_RIGHT,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_SHADOW_TYPE,
+                                   g_param_spec_enum ("shadow-type",
+                                                      P_("Arrow shadow"),
+                                                      P_("Appearance of the shadow surrounding the arrow"),
+                                                     GTK_TYPE_SHADOW_TYPE,
+                                                     GTK_SHADOW_OUT,
+                                                      GTK_PARAM_READWRITE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_float ("arrow-scaling",
+                                                               P_("Arrow Scaling"),
+                                                               P_("Amount of space used up by arrow"),
+                                                               0.0, 1.0, 0.7,
+                                                               GTK_PARAM_READABLE));
+
+  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ARROW_ACCESSIBLE);
+}
+
+static void
+gtk_arrow_set_property (GObject         *object,
+                       guint            prop_id,
+                       const GValue    *value,
+                       GParamSpec      *pspec)
+{
+  GtkArrow *arrow = GTK_ARROW (object);
+  GtkArrowPrivate *priv = arrow->priv;
+
+  switch (prop_id)
+    {
+    case PROP_ARROW_TYPE:
+      gtk_arrow_set (arrow,
+                    g_value_get_enum (value),
+                    priv->shadow_type);
+      break;
+    case PROP_SHADOW_TYPE:
+      gtk_arrow_set (arrow,
+                    priv->arrow_type,
+                    g_value_get_enum (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_arrow_get_property (GObject         *object,
+                       guint            prop_id,
+                       GValue          *value,
+                       GParamSpec      *pspec)
+{
+  GtkArrow *arrow = GTK_ARROW (object);
+  GtkArrowPrivate *priv = arrow->priv;
+
+  switch (prop_id)
+    {
+    case PROP_ARROW_TYPE:
+      g_value_set_enum (value, priv->arrow_type);
+      break;
+    case PROP_SHADOW_TYPE:
+      g_value_set_enum (value, priv->shadow_type);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_arrow_init (GtkArrow *arrow)
+{
+  arrow->priv = gtk_arrow_get_instance_private (arrow);
+
+  gtk_widget_set_has_window (GTK_WIDGET (arrow), FALSE);
+
+  arrow->priv->arrow_type = GTK_ARROW_RIGHT;
+  arrow->priv->shadow_type = GTK_SHADOW_OUT;
+}
+
+static void
+gtk_arrow_get_preferred_width (GtkWidget *widget,
+                               gint      *minimum_size,
+                               gint      *natural_size)
+{
+  GtkBorder border;
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+  _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+  *minimum_size = MIN_ARROW_SIZE + border.left + border.right;
+  *natural_size = MIN_ARROW_SIZE + border.left + border.right;
+}
+
+static void
+gtk_arrow_get_preferred_height (GtkWidget *widget,
+                                gint      *minimum_size,
+                                gint      *natural_size)
+{
+  GtkBorder border;
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+  _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+  *minimum_size = MIN_ARROW_SIZE + border.top + border.bottom;
+  *natural_size = MIN_ARROW_SIZE + border.top + border.bottom;
+}
+
+/**
+ * gtk_arrow_new:
+ * @arrow_type: a valid #GtkArrowType.
+ * @shadow_type: a valid #GtkShadowType.
+ *
+ * Creates a new #GtkArrow widget.
+ *
+ * Returns: the new #GtkArrow widget.
+ *
+ * Deprecated: 3.14: Use a #GtkImage with a suitable icon.
+ */
+GtkWidget*
+gtk_arrow_new (GtkArrowType  arrow_type,
+              GtkShadowType shadow_type)
+{
+  GtkArrowPrivate *priv;
+  GtkArrow *arrow;
+
+  arrow = g_object_new (GTK_TYPE_ARROW, NULL);
+
+  priv = arrow->priv;
+
+  priv->arrow_type = arrow_type;
+  priv->shadow_type = shadow_type;
+
+  return GTK_WIDGET (arrow);
+}
+
+/**
+ * gtk_arrow_set:
+ * @arrow: a widget of type #GtkArrow.
+ * @arrow_type: a valid #GtkArrowType.
+ * @shadow_type: a valid #GtkShadowType.
+ *
+ * Sets the direction and style of the #GtkArrow, @arrow.
+ *
+ * Deprecated: 3.14: Use a #GtkImage with a suitable icon.
+ */
+void
+gtk_arrow_set (GtkArrow      *arrow,
+              GtkArrowType   arrow_type,
+              GtkShadowType  shadow_type)
+{
+  GtkArrowPrivate *priv;
+  GtkWidget *widget;
+
+  g_return_if_fail (GTK_IS_ARROW (arrow));
+
+  priv = arrow->priv;
+
+  if (priv->arrow_type != arrow_type
+      || priv->shadow_type != shadow_type)
+    {
+      g_object_freeze_notify (G_OBJECT (arrow));
+
+      if ((GtkArrowType) priv->arrow_type != arrow_type)
+        {
+          priv->arrow_type = arrow_type;
+          g_object_notify (G_OBJECT (arrow), "arrow-type");
+        }
+
+      if (priv->shadow_type != shadow_type)
+        {
+          priv->shadow_type = shadow_type;
+          g_object_notify (G_OBJECT (arrow), "shadow-type");
+        }
+
+      g_object_thaw_notify (G_OBJECT (arrow));
+
+      widget = GTK_WIDGET (arrow);
+      if (gtk_widget_is_drawable (widget))
+       gtk_widget_queue_draw (widget);
+    }
+}
+
+static gboolean
+gtk_arrow_draw (GtkWidget *widget,
+                cairo_t   *cr)
+{
+  GtkArrow *arrow = GTK_ARROW (widget);
+  GtkArrowPrivate *priv = arrow->priv;
+  GtkStyleContext *context;
+  gdouble x, y;
+  gint width, height;
+  gint extent;
+  GtkBorder border;
+  gfloat xalign, yalign;
+  GtkArrowType effective_arrow_type;
+  gfloat arrow_scaling;
+  gdouble angle;
+
+  if (priv->arrow_type == GTK_ARROW_NONE)
+    return FALSE;
+
+  context = gtk_widget_get_style_context (widget);
+  gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+  _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
+  gtk_misc_get_alignment (GTK_MISC (widget), &xalign, &yalign);
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+  width = gtk_widget_get_allocated_width (widget) - border.left - border.right;
+  height = gtk_widget_get_allocated_height (widget) - border.top - border.bottom;
+
+  extent = MIN (width, height) * arrow_scaling;
+  effective_arrow_type = priv->arrow_type;
+
+  if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
+    {
+      xalign = 1.0 - xalign;
+      if (priv->arrow_type == GTK_ARROW_LEFT)
+        effective_arrow_type = GTK_ARROW_RIGHT;
+      else if (priv->arrow_type == GTK_ARROW_RIGHT)
+        effective_arrow_type = GTK_ARROW_LEFT;
+    }
+
+  x = border.left + ((width - extent) * xalign);
+  y = border.top + ((height - extent) * yalign);
+
+  switch (effective_arrow_type)
+    {
+    case GTK_ARROW_UP:
+      angle = 0;
+      break;
+    case GTK_ARROW_RIGHT:
+      angle = G_PI / 2;
+      break;
+    case GTK_ARROW_DOWN:
+      angle = G_PI;
+      break;
+    case GTK_ARROW_LEFT:
+    default:
+      angle = (3 * G_PI) / 2;
+      break;
+    }
+
+  gtk_render_arrow (context, cr, angle, x, y, extent);
+
+  return FALSE;
+}
diff --git a/gtk/deprecated/gtkarrow.h b/gtk/deprecated/gtkarrow.h
new file mode 100644 (file)
index 0000000..faf67bc
--- /dev/null
@@ -0,0 +1,84 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_ARROW_H__
+#define __GTK_ARROW_H__
+
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/deprecated/gtkmisc.h>
+
+
+G_BEGIN_DECLS
+
+
+#define GTK_TYPE_ARROW                  (gtk_arrow_get_type ())
+#define GTK_ARROW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW, GtkArrow))
+#define GTK_ARROW_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW, GtkArrowClass))
+#define GTK_IS_ARROW(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW))
+#define GTK_IS_ARROW_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
+#define GTK_ARROW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
+
+typedef struct _GtkArrow              GtkArrow;
+typedef struct _GtkArrowPrivate       GtkArrowPrivate;
+typedef struct _GtkArrowClass         GtkArrowClass;
+
+struct _GtkArrow
+{
+  GtkMisc misc;
+
+  /*< private >*/
+  GtkArrowPrivate *priv;
+};
+
+struct _GtkArrowClass
+{
+  GtkMiscClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+
+GDK_DEPRECATED_IN_3_14
+GType      gtk_arrow_get_type   (void) G_GNUC_CONST;
+GDK_DEPRECATED_IN_3_14
+GtkWidget* gtk_arrow_new        (GtkArrowType   arrow_type,
+                                GtkShadowType  shadow_type);
+GDK_DEPRECATED_IN_3_14
+void       gtk_arrow_set        (GtkArrow      *arrow,
+                                GtkArrowType   arrow_type,
+                                GtkShadowType  shadow_type);
+
+
+G_END_DECLS
+
+
+#endif /* __GTK_ARROW_H__ */
index 784d1294565f4475922ac0a97e0051f5472628ee..a2453176397c226976869b97e9140686fc42052e 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -43,7 +43,6 @@
 #include <gtk/gtkappchooserbutton.h>
 #include <gtk/gtkapplication.h>
 #include <gtk/gtkapplicationwindow.h>
-#include <gtk/gtkarrow.h>
 #include <gtk/gtkaspectframe.h>
 #include <gtk/gtkassistant.h>
 #include <gtk/gtkbbox.h>
 #include <gtk/gtkwindow.h>
 
 #ifndef GTK_DISABLE_DEPRECATED
+#include <gtk/deprecated/gtkarrow.h>
 #include <gtk/deprecated/gtkactivatable.h>
 #include <gtk/deprecated/gtkaction.h>
 #include <gtk/deprecated/gtkactiongroup.h>
diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
deleted file mode 100644 (file)
index 0b09097..0000000
+++ /dev/null
@@ -1,363 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-/**
- * SECTION:gtkarrow
- * @Short_description: Displays an arrow
- * @Title: GtkArrow
- * @See_also: gtk_render_arrow()
- *
- * GtkArrow should be used to draw simple arrows that need to point in
- * one of the four cardinal directions (up, down, left, or right).  The
- * style of the arrow can be one of shadow in, shadow out, etched in, or
- * etched out.  Note that these directions and style types may be
- * amended in versions of GTK+ to come.
- *
- * GtkArrow will fill any space alloted to it, but since it is inherited
- * from #GtkMisc, it can be padded and/or aligned, to fill exactly the
- * space the programmer desires.
- *
- * Arrows are created with a call to gtk_arrow_new().  The direction or
- * style of an arrow can be changed after creation by using gtk_arrow_set().
- */
-
-#include "config.h"
-#include <math.h>
-#include "gtkarrow.h"
-#include "gtksizerequest.h"
-#include "gtktypebuiltins.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-
-#include "a11y/gtkarrowaccessible.h"
-
-#define MIN_ARROW_SIZE  15
-
-struct _GtkArrowPrivate
-{
-  gint16 arrow_type;
-  gint16 shadow_type;
-};
-
-enum {
-  PROP_0,
-  PROP_ARROW_TYPE,
-  PROP_SHADOW_TYPE
-};
-
-
-static void     gtk_arrow_set_property (GObject        *object,
-                                        guint           prop_id,
-                                        const GValue   *value,
-                                        GParamSpec     *pspec);
-static void     gtk_arrow_get_property (GObject        *object,
-                                        guint           prop_id,
-                                        GValue         *value,
-                                        GParamSpec     *pspec);
-static gboolean gtk_arrow_draw         (GtkWidget      *widget,
-                                        cairo_t        *cr);
-
-static void     gtk_arrow_get_preferred_width         (GtkWidget           *widget,
-                                                       gint                *minimum_size,
-                                                       gint                *natural_size);
-static void     gtk_arrow_get_preferred_height        (GtkWidget           *widget,
-                                                       gint                *minimum_size,
-                                                       gint                *natural_size);
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-G_DEFINE_TYPE_WITH_PRIVATE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-static void
-gtk_arrow_class_init (GtkArrowClass *class)
-{
-  GObjectClass *gobject_class;
-  GtkWidgetClass *widget_class;
-
-  gobject_class = (GObjectClass*) class;
-  widget_class = (GtkWidgetClass*) class;
-
-  gobject_class->set_property = gtk_arrow_set_property;
-  gobject_class->get_property = gtk_arrow_get_property;
-
-  widget_class->draw = gtk_arrow_draw;
-  widget_class->get_preferred_width  = gtk_arrow_get_preferred_width;
-  widget_class->get_preferred_height = gtk_arrow_get_preferred_height;
-
-  g_object_class_install_property (gobject_class,
-                                   PROP_ARROW_TYPE,
-                                   g_param_spec_enum ("arrow-type",
-                                                      P_("Arrow direction"),
-                                                      P_("The direction the arrow should point"),
-                                                     GTK_TYPE_ARROW_TYPE,
-                                                     GTK_ARROW_RIGHT,
-                                                      GTK_PARAM_READWRITE));
-
-  g_object_class_install_property (gobject_class,
-                                   PROP_SHADOW_TYPE,
-                                   g_param_spec_enum ("shadow-type",
-                                                      P_("Arrow shadow"),
-                                                      P_("Appearance of the shadow surrounding the arrow"),
-                                                     GTK_TYPE_SHADOW_TYPE,
-                                                     GTK_SHADOW_OUT,
-                                                      GTK_PARAM_READWRITE));
-
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_float ("arrow-scaling",
-                                                               P_("Arrow Scaling"),
-                                                               P_("Amount of space used up by arrow"),
-                                                               0.0, 1.0, 0.7,
-                                                               GTK_PARAM_READABLE));
-
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ARROW_ACCESSIBLE);
-}
-
-static void
-gtk_arrow_set_property (GObject         *object,
-                       guint            prop_id,
-                       const GValue    *value,
-                       GParamSpec      *pspec)
-{
-  GtkArrow *arrow = GTK_ARROW (object);
-  GtkArrowPrivate *priv = arrow->priv;
-
-  switch (prop_id)
-    {
-    case PROP_ARROW_TYPE:
-      gtk_arrow_set (arrow,
-                    g_value_get_enum (value),
-                    priv->shadow_type);
-      break;
-    case PROP_SHADOW_TYPE:
-      gtk_arrow_set (arrow,
-                    priv->arrow_type,
-                    g_value_get_enum (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_arrow_get_property (GObject         *object,
-                       guint            prop_id,
-                       GValue          *value,
-                       GParamSpec      *pspec)
-{
-  GtkArrow *arrow = GTK_ARROW (object);
-  GtkArrowPrivate *priv = arrow->priv;
-
-  switch (prop_id)
-    {
-    case PROP_ARROW_TYPE:
-      g_value_set_enum (value, priv->arrow_type);
-      break;
-    case PROP_SHADOW_TYPE:
-      g_value_set_enum (value, priv->shadow_type);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_arrow_init (GtkArrow *arrow)
-{
-  arrow->priv = gtk_arrow_get_instance_private (arrow);
-
-  gtk_widget_set_has_window (GTK_WIDGET (arrow), FALSE);
-
-  arrow->priv->arrow_type = GTK_ARROW_RIGHT;
-  arrow->priv->shadow_type = GTK_SHADOW_OUT;
-}
-
-static void
-gtk_arrow_get_preferred_width (GtkWidget *widget,
-                               gint      *minimum_size,
-                               gint      *natural_size)
-{
-  GtkBorder border;
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-  *minimum_size = MIN_ARROW_SIZE + border.left + border.right;
-  *natural_size = MIN_ARROW_SIZE + border.left + border.right;
-}
-
-static void
-gtk_arrow_get_preferred_height (GtkWidget *widget,
-                                gint      *minimum_size,
-                                gint      *natural_size)
-{
-  GtkBorder border;
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-  *minimum_size = MIN_ARROW_SIZE + border.top + border.bottom;
-  *natural_size = MIN_ARROW_SIZE + border.top + border.bottom;
-}
-
-/**
- * gtk_arrow_new:
- * @arrow_type: a valid #GtkArrowType.
- * @shadow_type: a valid #GtkShadowType.
- *
- * Creates a new #GtkArrow widget.
- *
- * Returns: the new #GtkArrow widget.
- */
-GtkWidget*
-gtk_arrow_new (GtkArrowType  arrow_type,
-              GtkShadowType shadow_type)
-{
-  GtkArrowPrivate *priv;
-  GtkArrow *arrow;
-
-  arrow = g_object_new (GTK_TYPE_ARROW, NULL);
-
-  priv = arrow->priv;
-
-  priv->arrow_type = arrow_type;
-  priv->shadow_type = shadow_type;
-
-  return GTK_WIDGET (arrow);
-}
-
-/**
- * gtk_arrow_set:
- * @arrow: a widget of type #GtkArrow.
- * @arrow_type: a valid #GtkArrowType.
- * @shadow_type: a valid #GtkShadowType.
- *
- * Sets the direction and style of the #GtkArrow, @arrow.
- */
-void
-gtk_arrow_set (GtkArrow      *arrow,
-              GtkArrowType   arrow_type,
-              GtkShadowType  shadow_type)
-{
-  GtkArrowPrivate *priv;
-  GtkWidget *widget;
-
-  g_return_if_fail (GTK_IS_ARROW (arrow));
-
-  priv = arrow->priv;
-
-  if (priv->arrow_type != arrow_type
-      || priv->shadow_type != shadow_type)
-    {
-      g_object_freeze_notify (G_OBJECT (arrow));
-
-      if ((GtkArrowType) priv->arrow_type != arrow_type)
-        {
-          priv->arrow_type = arrow_type;
-          g_object_notify (G_OBJECT (arrow), "arrow-type");
-        }
-
-      if (priv->shadow_type != shadow_type)
-        {
-          priv->shadow_type = shadow_type;
-          g_object_notify (G_OBJECT (arrow), "shadow-type");
-        }
-
-      g_object_thaw_notify (G_OBJECT (arrow));
-
-      widget = GTK_WIDGET (arrow);
-      if (gtk_widget_is_drawable (widget))
-       gtk_widget_queue_draw (widget);
-    }
-}
-
-static gboolean
-gtk_arrow_draw (GtkWidget *widget,
-                cairo_t   *cr)
-{
-  GtkArrow *arrow = GTK_ARROW (widget);
-  GtkArrowPrivate *priv = arrow->priv;
-  GtkStyleContext *context;
-  gdouble x, y;
-  gint width, height;
-  gint extent;
-  GtkBorder border;
-  gfloat xalign, yalign;
-  GtkArrowType effective_arrow_type;
-  gfloat arrow_scaling;
-  gdouble angle;
-
-  if (priv->arrow_type == GTK_ARROW_NONE)
-    return FALSE;
-
-  context = gtk_widget_get_style_context (widget);
-  gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
-  gtk_misc_get_alignment (GTK_MISC (widget), &xalign, &yalign);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-  width = gtk_widget_get_allocated_width (widget) - border.left - border.right;
-  height = gtk_widget_get_allocated_height (widget) - border.top - border.bottom;
-
-  extent = MIN (width, height) * arrow_scaling;
-  effective_arrow_type = priv->arrow_type;
-
-  if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
-    {
-      xalign = 1.0 - xalign;
-      if (priv->arrow_type == GTK_ARROW_LEFT)
-        effective_arrow_type = GTK_ARROW_RIGHT;
-      else if (priv->arrow_type == GTK_ARROW_RIGHT)
-        effective_arrow_type = GTK_ARROW_LEFT;
-    }
-
-  x = border.left + ((width - extent) * xalign);
-  y = border.top + ((height - extent) * yalign);
-
-  switch (effective_arrow_type)
-    {
-    case GTK_ARROW_UP:
-      angle = 0;
-      break;
-    case GTK_ARROW_RIGHT:
-      angle = G_PI / 2;
-      break;
-    case GTK_ARROW_DOWN:
-      angle = G_PI;
-      break;
-    case GTK_ARROW_LEFT:
-    default:
-      angle = (3 * G_PI) / 2;
-      break;
-    }
-
-  gtk_render_arrow (context, cr, angle, x, y, extent);
-
-  return FALSE;
-}
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
deleted file mode 100644 (file)
index 3d19336..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_ARROW_H__
-#define __GTK_ARROW_H__
-
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#include <gtk/deprecated/gtkmisc.h>
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_ARROW                  (gtk_arrow_get_type ())
-#define GTK_ARROW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW, GtkArrow))
-#define GTK_ARROW_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW, GtkArrowClass))
-#define GTK_IS_ARROW(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW))
-#define GTK_IS_ARROW_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
-#define GTK_ARROW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
-
-typedef struct _GtkArrow              GtkArrow;
-typedef struct _GtkArrowPrivate       GtkArrowPrivate;
-typedef struct _GtkArrowClass         GtkArrowClass;
-
-struct _GtkArrow
-{
-  GtkMisc misc;
-
-  /*< private >*/
-  GtkArrowPrivate *priv;
-};
-
-struct _GtkArrowClass
-{
-  GtkMiscClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GDK_AVAILABLE_IN_ALL
-GType      gtk_arrow_get_type   (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
-GtkWidget* gtk_arrow_new        (GtkArrowType   arrow_type,
-                                GtkShadowType  shadow_type);
-GDK_AVAILABLE_IN_ALL
-void       gtk_arrow_set        (GtkArrow      *arrow,
-                                GtkArrowType   arrow_type,
-                                GtkShadowType  shadow_type);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_ARROW_H__ */